From e13fe1f1e9461305076687fae46aeb5486c32058 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 20 Sep 2022 10:10:12 +0100 Subject: [PATCH] Mark two patches as applied upstream Gbp-Dch: ignore --- ...ild-Use-more-conservative-GResource-embedding-on-non-x8.patch | 1 + ...kevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch b/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch index 9d930d2132..316172f74a 100644 --- a/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch +++ b/debian/patches/build-Use-more-conservative-GResource-embedding-on-non-x8.patch @@ -12,6 +12,7 @@ of using slower but more conservative GResource embedding. Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5107 Signed-off-by: Simon McVittie Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4956 +Applied-upstream: 4.9.0, commit:60a83a51c3c3ae926df991a1e92a61a6129adaa6 --- gtk/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch b/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch index 3f4f0bf673..34c32bab3a 100644 --- a/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch +++ b/debian/patches/gdkevents-Don-t-ignore-modifiers-that-are-not-currently-a.patch @@ -28,6 +28,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5095 Bug-Debian: https://bugs.debian.org/1016927 Signed-off-by: Simon McVittie Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5037 +Applied-upstream: 4.9.0, commit:79285bd63ee9834c2e77ff9639d14a4cd6b7c3c8 --- gdk/gdkevents.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) -- 2.30.2